Merge "Added support for FlashSuperLayoutTask"