Merge "Added removeUserWhenPossible API as SystemAPI"