Bug 1072913 - Disable test_play_3gp_video until Bug 1050667 is fixed
Bug 1074499 - Check setCallingLineIdRestriction directly instead of using hasOwnProperty
Merge pull request #24745 from crh0716/1074499

Bug 1074499 - Check setCallingLineIdRestriction directly instead of using hasOwnProperty r=alive
Merge pull request #24430 from bebef1987/xfail_video1

Bug 1072913 - Disable test_play_3gp_video until Bug 1050667 is fixed
Revert "Bug 1074909 - Only display loaded favicons. r=kgrandon" for test timeouts

This reverts commit 03b59751d60912dce55198968c988abc00c2c15b.
Bug 1074906 - enable screen reader in accessibility settings

fixed comment
Fixed merge conflicts