Merge "Reduce the trigger points for showing/hiding the scanning animation" into main