Merge "Update register and unregisterControllerAlwaysOnListener"