Merge "Screen on/off animation tweaks" into gingerbread