Track display/media-caf-7x30

Change-Id: If077fa157b6eb531d8a780e6f1214547139c6365
Merge "Track display/media-caf-7x30" into kitkat