Merge pull request #17559 from mcav/1.3-uplift

Bug 981255 - [Sora][MMI]Alarm display abnormally when unlock screen. r=millermedeiros
Merge pull request #17555 from shamenchens/Bug984834-Video-Playback

Bug984834 Video Playback workaround patch, r=johnhu
Bug 987133 - Unxfail and fix test_cards_view_with_two_apps.py
Revert "Bug 987133 - Unxfail and fix test_cards_view_with_two_apps.py"

This reverts commit 7e705dd4718d528974d99ac31866318d7e201152.
Bug 987018 - [DSDS] Fix focus() method calling on SIM picker to hide the keyboard. r=julienw