Bug push message displayed when go back to activity

See comments in commits.