Merge "Remove usages of isDisplayOccluded" into main