Merge "Improving profiling of views." into gingerbread