Backed out 965c62289427:cb894b5d342f for perma-orange on b2g emulator M10 r=backout
Merge m-c to b-i