Merge "Supports USER_INTERACTION_ENABLED for text components" into devel/master