Merge "Improve framerate adaptation"