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

Change-Id: I1a60f11b1ebca0c6f89cce68a31f471f87523f81