Merge "Fix App battery usage crash" into udc-dev