Cleanup AppOps code,remove redundant code causing FC

To reproduce the bug : Settings - any app - App Info - Modify - Select the second one - FC. This should remove the second choice and fixes it.