Merge "Fixed several bugs introduced by the new background views."