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

Change-Id: I501a7b701da888299eed773cd90a1bb17304f11d