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