Merge commit '19fa6d4586df8ff7897fcc73b2228b431502d58e' into kraken * commit '19fa6d4586df8ff7897fcc73b2228b431502d58e': Don't inflate the zoom button controller until we
Merge commit '19fa6d4586df8ff7897fcc73b2228b431502d58e' into kraken * commit '19fa6d4586df8ff7897fcc73b2228b431502d58e': Don't inflate the zoom button controller until we