Merge "Disable screen wake locks for cached apps" into udc-dev