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