Merge "cts: add test for persistent input surface" into mnc-dev