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

Change-Id: I320aa5bc7887898e5e9b70b3cb10d9512787f6eb