Merge "Fix bugs with SWITCHING_TYPE_RENDER_FRAME_RATE_ONLY"