Merge pull request #20712 from davidflanagan/bug1026846

Bug 1026846: require the type parameter for FL app view activity r=amac
Bug 1028843 - Improve wait for b2g to be resistant to JavaScript exceptions. r=zcampbell
Merge branch 'v1.3' into v1.3t