Merge "Fix regression in remote views." into lmp-dev