Do not merge. Make the height remain the same when choosing folder.

Bug:2953515
Change-Id: I0f3df295f7f9825e48671f358c434e8c445b0533
2 files changed