Merge "Fixes an error when displaying the current layout test index."