Merge "Fix isOccludedByApp to exclude when occluded by communal (a non-app)." into main