Merge "Make sure the ringer drawer is present before trying to hide it." into sc-dev