Merge "Fix broken lock screen affordances"