Merge "Fixes home button showing on lockscreen in three button mode" into rvc-dev am: d2b0f54cb8 am: 196bc080c1 am: 4a045d46c4

Change-Id: I773a583653cc3c18c1462ae374f454f22dfa0f96