Merge "Revert "Change quickstep onboarding tip window type to"" into pi-dev am: b2b255a131
am: 09b4dbdf2a

Change-Id: I8d7cf4edc03e798e0cebb63c8f933eb58417fafb