Merge "Move inactive user filtering to its own filter" into rvc-dev am: dc3919ab am: ccb5630b am: 7bc4be57 am: 7d56613c Change-Id: I70333a69e20951315b9dd23d4101b74c3e7f9a34