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

Change-Id: Ic3aee47b93a314dee6022c180131d7b55e039d9b