Merge "Switch from Theme.Holo.Light.Extended to Theme.Holo.Light"