Merge "Fix broken System.getStringForUser"