Merge "Layout code items of post startup methods"