Merge "RESTRICT AUTOMERGE: testMarginsArePercentagesOfContentFrame failed" into pie-cts-dev