Merge "Camera: Limit framerate re-configurations during HFR" into pi-dev