Merge "Show control overlay when earphone is unplugged" into ics-mr1