Merge "Fix test case for PercentFrameLayout." into mnc-ub-dev