Merge "Add support for force-enabling zoom"