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

Change-Id: Ie8ce5ab016b81da9de73834a03d97f89a017b384