Merge "Flip device controls panel flag" into tm-qpr-dev