Merge "ui: Manage loaded resources with smart pointers." am: 06aea3a894
am: 18a5d529cd

Change-Id: I6249fc282220935c344a45f30332a7cfbb6beb8f