Merge "Revert "Bouncer: Add title for each auth screen."" into tm-dev