Merge "Cancel AodTimeoutAction when display is unconfigured." into tm-qpr-dev