Merge "Flatten LauncherUIChanged / Migrate Launcher Workspace snapshot data" into rvc-dev am: b3a298d4af am: b724f3d1a0 am: 1fdf0f7c8c

Change-Id: I56b3bfe1d9e158917e4fe081b407855297d4b5aa