Merge "Fix hotseat border space crash GSI" into udc-qpr-dev