Merge "Add facilities for layout transitions"