Merge "Bouncer: Remove overlap with shade and bouncer" into tm-dev