Bug 1068470 - [soft-home-button] SHB missing when lockscreen is on, and there is an incoming call
Bug 1078727 - GPS icon in status bar can sometimes take 30–60 seconds to update in B2G 2.1
Merge pull request #24893 from gmarty/Bug-1068470-soft-home-button-SHB-missing-when-lockscreen-is-on-and-there-is-an-incoming-call

Bug 1068470 - [soft-home-button] SHB missing when lockscreen is on, and there is an incoming call
Merge pull request #24947 from gmarty/Bug-1078727-GPS-icon-status-bar-can-sometimes-take-30-60-seconds-update

Bug 1078727 - GPS icon in status bar can sometimes take 30–60 seconds to...