Disable flaky view test
Merge remote-tracking branch 'upstream/master'
Refactor and lockUX