Merge "Set cache dirty when re-create the cache bitmap" into lmp-dev