Merge "ldpi: Update status_bar_expanded layout" into gingerbread