Merge "Convert gr-confirm-cherrypick-dialog to lit" into stable-3.6