Merge "Remove ResourceImages from Popup implementation" into devel/master