Merge "Add occlusion state for surface flinger trace" into rvc-dev