Merge "Device Controls - Supporting activity launch" into sc-qpr1-dev