DO NOT MERGE: Fix ActivityView surface can't visible for ActivityViewTest
am: dc9b319039

Change-Id: Iedaebd2888f402e382a4eaf0d7385df2c17d0bdd