Merge "Immediately close the shade when the status bar is disabled. (DO NOT MERGE)" into eclair