Merge "Prevent ZBoost of TaskDisplayArea" into rvc-dev