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

Change-Id: I86b140c89a01ec7d8032f9b136b494af64e9bdab