Merge "Check for no error in getting planeLayout in lock" into rvc-dev am: 06e0cee7de

Change-Id: I1fe0a67a534ca31626783c3ac27de3bce599202b