Merge "Check for no error in getting planeLayout in lock" into rvc-dev