Merge "Fixed size-related popup test case" into devel/master