Merge "Move inactive user filtering to its own filter" into rvc-dev am: dc3919ab am: ccb5630b am: edab3f9c am: d1ccb8f4 Change-Id: Ibbc5ace38b147e330c6add505f9db317bbe1aaeb