Merge "QCamera2: Removes obsolete code for AF, zoom events"