Merge "Crash on device controls availability" into sc-qpr1-dev