Merge "Update mInsetsHint regardless of the nullity of mControl" into udc-qpr-dev