Showing Bytes to Units
Merge pull request #8428 from leob2g/Bug_833667_Showing_Bytes_to_Units

Bug_833667 [Cost Control] Showing Bytes to Units r=lodr
Cause r+
Bug 846768 - Switching apps is broken when we close another app before r=timdream

Several problems:
- we were decrementing twice the currentDisplayedApp value when closing using a
  swipe
- remove the useless callback in alignCurrentCard. We were not calling it in all
  situations before, but now I just removed it because we don't need to align
  before launching the app
Include Phone as clickable in a sms
Merge remote-tracking branch 'upstream/master' into sms-email