Merge "Fix 3500730: Prevent NPE cause by clicking on footer view"