Merge "DO NOT MERGE: Put killing self action into main thread" into pie-cts-dev