Merge "Fix stuck-open notification shade." into honeycomb