Merge "[Bouncer] ensure bouncer not shown with doze state." into tm-qpr-dev