Merge "Fix crash in forceViewsToAppear"