Merge "Camera service: Speed up camera service startup on boot"