Merge "Fix locked second screen on boot" into rvc-dev am: 2455e984 am: 09960b94 am: a6d309d0 am: bfc8b2d2 Change-Id: I57deb035da3e0c68426b7d7bbb5c58f475333bc7