Merge "Keyguard indication area - owner info fix" into sc-qpr1-dev