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

Change-Id: I1e7ad2617ff04f9b24ea330ce664114779dcba01