Merge "Fix text color in MultimediaFragment" am: 87f4ca0659
am: 965625055c

Change-Id: I09dcc0da310b3423c79724c744f9bdce214d803d