Merge "[automerger skipped] Merge "Do not show the notification footer until...
Merge "[automerger skipped] Merge "Do not show the notification footer until the user is set up." into sc-dev am: af8c9878 am: 17001144 -s ours am: c73460cf -s ours am: 933e43dc -s ours"