Merge "Hide periodic scanning"