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

Change-Id: I0181a2cfa43f1022653b494e8e68a97bc65454d7