[automerger] Merge "Revert "Change quickstep onboarding tip window type to"" into pi-dev am: b2b255a131 am: 86e5aa8731

Change-Id: I46bc865fd3794d2ce8b79415b12be64ce0a46c36