Merge "Bouncer is never showing in AOD" into tm-dev