Merge "Fixes home button showing on lockscreen in three button mode" into rvc-dev