change disable view behavior
Merge commit '73b9d4495b85fcbd81b1a00dad8bc70d3e3ae5fc'