Merge "Fix IllegalStateException in KeyboardBaclightController" into udc-dev