Merge "Fix issue #62524613: Background limitation is not working as expected..." into oc-dev am: 2b20d552bd
am: 3d268c9b7b

Change-Id: I4b5d9089069025adca144ee63b0edee393930487