Merge "Fix bugs regarding Camera Video test" into kitkat-cts-dev