Merge "Fix issue #62524613: Background limitation is not working as expected..." into oc-dev am: 2b20d552bd am: 216bd4fa6f
am: 5b7da7e6c3

Change-Id: I0d5ec13e77a3e215537cf8704a06ee262fda5f91