Merge "Fix for transition layout suppression" into klp-dev