Merge "Minor fixes to occlusion layers computation and display." into main