Merge "Remove overlay view for better performance" into mnc-ub-dev