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

Change-Id: Id76ca5b865603af8188c4f85ed77626bd21711c3