Merge "Fix View backward navigation bug"