Merge "Ensure await lux calls are completed when there is no sensor activity." into tm-qpr-dev