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