Merge "Don't require unlock to dismiss a media control" into sc-dev