Put fragment in specific activity's whitelist

Change-Id: I782dc8ec29e49a834832dc8357b3fdb12846e8a9
Merge remote-tracking branch 'SOAP/kitkat-mr1.1-release' into kitkat