Move data-related controls with filmstrip.

bug:12015169
Change-Id: I3185acc37adec23fc696f6693236178779a7459e
3 files changed