Follow up addressing comments of pulsing refactor

Because of various rebases, this is much easier.

Test: atest SystemUITests
Fixes: 125942236
Change-Id: I169a0ee1843b8a34d29289cc70eaf650bade6997
6 files changed