Merge "Update ControllerAlwaysOnStateCallback to ControllerAlwaysOnListener"