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

Change-Id: I52b8db57081d12f1b13f5a6568cd6f3e660dc39b