Merge changes from topic "rules_fd_from_disk"

* changes:
  Add temp ANGLE rules support
  Remove app preference from ANGLE logic