Merge "Set PREPARING flag after setDataSource_l()" into klp-dev