Merge "Fixes home button showing on lockscreen in three button mode" into rvc-dev am: d2b0f54cb8 am: 9193f36318 am: 818009f24c

Change-Id: Ie43ff291b1252e9b8da64c73b6a65c43f645e37e