Merge "Only update insetsHint while necessary" into sc-dev