Merge "Revert "Enable indicator in tizen 5.0"" into devel/master