Merge "Make sure textviews draw in layers"