Merge "Add page creation latency for updatePreferenceStates"