Merge "Give CONTROL_DEVICE_LIGHTS permission to the shell"