Merge "Fix locked second screen on boot" into rvc-dev am: 2455e984 am: 09960b94 am: 02e1c314 am: 966252bb am: ff5f17c2 Change-Id: I4856773198f5e1d31ab6442af0ab339eaa50266e