Merge "Move keyguard shell transition init to onCreate" into sc-v2-dev