Merge "Fixes home button showing on lockscreen in three button mode" into rvc-dev am: d2b0f54c am: 196bc080 Change-Id: Iecf7bcfaa15a85fd1b3b9701bada1153596cb5c5