Merge "Clean up the AppRestrictionController instance after each test." into tm-dev