Merge "Force hiding fill UI when it's destroyed." into udc-qpr-dev