Merge "Add .mov to MediaScanner video file types" into nyc-mr1-dev