Shimmer: resolve conflicts#5034

Merged

cliffkoh merged 6 commits intomicrosoft:masterfrom

Vitalius1:v-vibr/RevertShimmerRevert

May 31, 2018

Commits on May 30, 2018

Revert changes.
Vitalie Braga
committed
More conflicts to resolve.
Vitalie Braga
committed
Fixes string in shimmer page.
Vitalie Braga
committed
Rush change log
Vitalie Braga
committed
Merge branch 'master' into v-vibr/RevertShimmerRevert
Vitalius1
authored

Commits on May 31, 2018

Merge branch 'master' into v-vibr/RevertShimmerRevert
Vitalius1
authored