Merge "Fix sdk layout rendering in JB."