Merge "SF: Don't bump to PERFORMANCE refresh rate with infrequent updates" into qt-r1-dev am: c775e762f4
am: ed9eae2f16

Change-Id: I85b685b7d57ddb1aa6225a784bb19cac00e505ca