Merge "Relax constraints on getting PlaneLayouts" into rvc-dev