Merge "Ensure we clear magnification specs on non-magnifiable containers."
am: b73052d94d

Change-Id: Ic450f99fb3fed5753f2dcfd547cb79161539ff70