Changes

* https://bugzilla.mozilla.org/show_bug.cgi?id=659188* https://bugzilla.mozilla.org/show_bug.cgi?id=621915|Feature landing criteria=Remaining bug for Android: [https://bugzilla.mozilla.org/show_bug.cgi?id=708175Bug 708175], which was just marked resolved fixed (April 14).