Bug 979212 - Require MockHomescreenLauncher in unit test of EdgeSwipeDetector
Merge pull request #16818 from dwi2/bug979212

Bug 979212 - Require MockHomescreenLauncher in unit test of EdgeSwipeDet...
Bug 959694 - Combine Rocketbar and statusbar