Merge "Fix fillsParent() always be false on finishing activity" into rvc-dev am: 838475b6fc am: 38bce0f6de am: 79de9cd029

Change-Id: I9e7d57b36fe4a16ed94b5beda171590f3717a0f3