Merge "galaxys2: update preview video size flag" into cm-10.2