Merge "Make modal based UI changes in TaskView only if modalness changes." into ub-launcher3-master