Merge "Only hide udfps bouncer when transitioning TO doze" into sc-dev