Fixed lint errors from layouts merge