Merge "Moving widget inflation logic to a separate class" into main