Merge "Fixes home button showing on lockscreen in three button mode" into rvc-dev am: d2b0f54c am: 196bc080 Change-Id: I73f72f3bd3e3bf94586ac8f4dcbc4fa10ba494ef