Merge "Add keyguard before app removal in Home Controls" into udc-dev