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

Change-Id: Id6d8af6624122409db635efd1d902348dbcffa92