Merge "Fix blank screen when launching controls activity" into tm-qpr-dev