Merge "Simplifying disabled widget view genration" into sc-dev