Merge "Merge "Fixes home button showing on lockscreen in three button mode" into rvc-dev am: d2b0f54c am: 196bc080 am: 9ef88413 am: 64182561" into rvc-qpr-dev-plus-aosp