Merge "Show notifications after capport login" am: 13fc7deed1

Change-Id: Icd96b7e506891dab75af9357d39b1e085caa6177