Merge "Fix setting camera op restriction on reboot" into sc-qpr1-dev