Merge "Increase collapsed height for resolver list with default and tabs" into rvc-dev am: 42987638f5 am: 3ccffa5e5b am: 36d82883f2 am: b740f60865 am: bdba2a8fec

Change-Id: I05b0c92490cfd635313e533e7fa98266cd2bd712