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

Change-Id: I8bc9511eaba1ee10123cdc134970cedae83cfc75