Merge "Fix theme for PostCallActivity" am: e4e997f9fa am: 53884bc530

Change-Id: Id5a9495d17f4c1747648a16385052fc84b2e1f9d