Merge "Fix inaccessible view issue." into tm-dev