Merge changes I25e3d390,Iae392277 into main

* changes:
  Use new Icon API to restrict showing some drawables
  Add a new hidden Icon API for loading