Merge "Make sure profiling is done only for views that are actually measured, laid out and drawn." into gingerbread