Fixes for I-109153

Fixes issues related to RIA Build and UI prototype dev tracks not showing up
Issue : https://appirio.my.salesforce.com/a3v50000000IAH8AAO