Merge "Fix animation in Night light page"