Merge "CTS-like Test for Face Effects recording support" into ics-mr1