Merge "Add a sysprop to control frame rate override"