Merge "Allow changing theme to Holo.Light without crashing" into cm-11.0