Merge pull request #14621 from hfiguiere/bug947259

Bug 947259 - Fix waitForEvent. r=julienw
(cherry picked from commit 9738f1d3bff9cc8fb5c92adf2c02f53ad6a52999)
Merge pull request #14579 from jaoo/933203

Bug 933203 - [DSDS] Operator variant logic: APN settings. r=kaze
(cherry picked from commit 53b010647062b4e2637f98ac3538af1c7bfe723a)