Merge "Disable overflow menu on lock screen." into rvc-dev