Merge "Snap: rename app to Camera" into n7.1-caf