Merge "Fix usage of temporary restricted keep clear area for hotseat" into udc-qpr-dev