Merge "Only update non-empty last frame in the first layout"