Activity recreation fixes