Merge "Revamp resources listing, part 1 (frameworks/base)"