Bug 828552 - [SMS] Fix transitions without flickering r=vingtetun
Bug 828939 - Bad manifest URL for here maps. r=julienw
Merge pull request #7500 from vingtetun/828939

Bug 828939 - Bad manifest URL for here maps. r=julienw
Merge pull request #7499 from borjasalguero/bug_transition_sms

Bug 828552 - [SMS] Fix transitions without flickering r=vingtetun
Auto-merge from branch 'master'