Merge "Fixes home button showing on lockscreen in three button mode" into rvc-dev am: d2b0f54c am: 9193f363 Change-Id: Iec19154221e4e16b912005f0c388835fc3c9a86a