Bug 882145: reland changesets bc4ee7cbd7bd and cf373e408a6b r=bz
Bug 915705: reland changesets f6402ce2b67a and 5bdec1cb1428 r=bz
Bug 882145: Mirror desktop UI changes for Android (bug 916609) r=jesup,jib