Merge "Fix NPE on calling Resources.getConfiguration()"