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