Merge "Only check dbFile to decide if grid migration is needed" into tm-qpr-dev

     * DeviceGridState without migration, or false otherwise.

     */

    public boolean isCompatible(DeviceGridState other) {

        if (this == other) return true;

        if (other == null) return false;

        return mNumHotseat == other.mNumHotseat

                && Objects.equals(mGridSizeString, other.mGridSizeString);

        if (this == other) {

            return true;

        }

        if (other == null) {

            return false;

        }

        return Objects.equals(mDbFile, other.mDbFile);

    }

    public Integer getColumns() {