Merge "Fix ringer drawer area being touchable while the drawer is closed." into sc-dev