Merge "Fix background sensor usage counter"