Merge "Cancel scroll indicator fade during allapps/workspace transition"