Freeze tab improvements

Change-Id: I5d5e5a7a18cafdbe845fa1ef949276bdfd1996d3
7 files changed