Merge "Move inactive user filtering to its own filter" into rvc-dev am: dc3919ab am: 5da7d04f am: 13b4c04c Change-Id: I93fa845ae8682edce229bc9776481b35d1866fa6