Bug 976846 - Update active app earlier
Merge pull request #16681 from alivedise/bugzilla/976846_master/update-active-app-early

Bug 976846 - Update active app earlier, r=timdream