Merge "Prepare SysUI Builder before building it."