Merge "Workaround getRefreshRate crash in edit mode - DO NOT MERGE" into nyc-mr1-dev am: 2e2060d9e0
am: 266926075a

Change-Id: I3140096f2ef497704c4e163b4ad754bb48138507