Merge "Keeps magnification button StartDelay for 3 secs even remove animations settings is on"