Revert "Revert "Put fragment in specific activity's whitelist""

This reverts commit e85b3969d19d5b373d87c9d68ac1533bd23f8617.

Change-Id: Ic6a1c9859995df88104aba27ede7e87bd6ce7986