Merge "Suppress IndexOutOfBoundsException when cancelling low light animation" into udc-dev