Bug 890004 - Completion of UA override changes for B2G 1.1 r=fabrice