Merge pull request #20337 from steveck-chung/Bug-1016897

Bug 1016897 - [Message] Previous saved draft will show up while entering edit new message view r=julienw
Merge pull request #20373 from KevinGrandon/bug_1021389_search_entry_point

Bug 1021389 - Local app search support for entry points is broken
Merge pull request #20400 from KevinGrandon/bug_1021000_notification_style

Bug 1021000 - Notification icon slightly cut off at top left of screen
Merge pull request #20369 from rnowm/1022878

Bug 1022878 - [B2G][Lockscreen] Long pressing power button on lockscreen does not bring up reboot menu r=alive