Merge "Controls Activity - Always close when keyguard becomes active" into sc-qpr1-dev